HDDS-13444. Unify isValidKeyPath implementation #9521
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
echonesis
reviewed
Dec 18, 2025
Comment on lines
132
to
135
| if (allowLeadingSlash && i == 0) { | ||
| // Allow empty at start for absolute paths | ||
| continue; | ||
| } |
Contributor
There was a problem hiding this comment.
It seems this section is not included in original OMClientRequest.isValidKeyPath().
Please describe more details in the commit message section.
| * Add reference counter to an object instance. | ||
| */ | ||
| class ReferenceCounted<T> { | ||
| public class ReferenceCounted<T> { |
Contributor
There was a problem hiding this comment.
Could we keep it package-private?
Contributor
Author
There was a problem hiding this comment.
I change to public cuz ci test error. I'll try to figure out the solution to keep it private.
| * Whether the pathname is valid. Currently prohibits relative paths, | ||
| * names which contain a ":" or "//", or other non-canonical paths. | ||
| */ | ||
| public static boolean isValidName(String src) { |
Contributor
There was a problem hiding this comment.
nit: use path instead of src to keep it consistent with isValidKeyPath
Contributor
Author
There was a problem hiding this comment.
sure, thanks for the reminder!
| } | ||
|
|
||
| @Test | ||
| public void testIsValidKeyPath() throws OMException { |
Contributor
There was a problem hiding this comment.
We could add some tests like
assertEquals("a/b/", OzoneFSUtils.isValidKeyPath("a/b/", true));assertThrows(OMException.class, () -> OzoneFSUtils.isValidKeyPath("/a/b", false));
adoroszlai
added
the
code-cleanup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This PR unified the duplicated isValidKeyPath validation logic between OzoneFSUtils and OMClientRequest by extracting the common path validation into a shared private method validateKeyPathComponents, and made OMClientRequest.isValidKeyPath delegate to OzoneFSUtils.isValidKeyPath to remove code duplication.
What is the link to the Apache JIRA
HDDS-13444
How was this patch tested?
https://github.com/rich7420/ozone/actions/runs/20323872107